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