[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: c9564dfc am: 5e204acd -s ours

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

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



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