Merge "Guard against the NPE in setPreferenceIcon()" into tm-dev am: cce3381ed4 am: 33622a034e am: 4dfa092886 am: fb691325b1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18447101 Change-Id: I512f5d098c0e8feb4728c7632716e66ce6503f21 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: