Merge "[automerger skipped] DO NOT MERGE am: 3f218c9a am: e0243c76 -s ours...

Merge "[automerger skipped] DO NOT MERGE am: 3f218c9a am: e0243c76 -s ours am: a7fd96bf -s ours am: 6059e668 -s ours am: ee691882 -s ours am: dccf456b -s ours am: 1c8d4495 -s ours am: 9d2b4b70 -s ours" into tm-d1-dev-plus-aosp am: ad674e68

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



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