Merge "Fix the NPE in the Settings Tile lib" into udc-d1-dev am: 2be625e2

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



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