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: Iaedbeae1a37ff1ba2cf6e232f6093b8b6940e45a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>