[automerger skipped] Merge "Fix the NPE in the Settings Tile lib" into...

[automerger skipped] Merge "Fix the NPE in the Settings Tile lib" into udc-d1-dev am: 2be625e2 am: dd7ae870 -s ours

am skip reason: Merged-In I6eaae2ca798d2deccea44137846fe9a4e294f26e with SHA-1 2f63ce63 is already in history

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



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