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

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



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