[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: 0203b15a am: c9fbb8c4 -s ours

am skip reason: Merged-In I41556971cd9e46cf68e6db606e9ee9f5d49e53b5 with SHA-1 3aead1cb is already in history

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



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