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