Merge changes from topic "am-a273f31a04c245659b767a57d71ec6af" into...

Merge changes from topic "am-a273f31a04c245659b767a57d71ec6af" into tm-d1-dev-plus-aosp am: 262441c3 am: 464a04c0

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



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