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