Merge "Guard against NPE in the Settings Tile lib" into udc-d1-dev am: 7913e255 am: 0203b15a

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



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