[automerger skipped] Merge "Guard against NPE in the Settings Tile lib" into...

[automerger skipped] Merge "Guard against NPE in the Settings Tile lib" into udc-d1-dev am: 7913e255 am: 56bc852f -s ours am: 8e70c153 -s ours

am skip reason: Merged-In I41556971cd9e46cf68e6db606e9ee9f5d49e53b5 with SHA-1 164d2085 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24112146



Change-Id: Iba391f49d395681c7a876fde099ba063384a1107
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>