Merge changes from topic "am-6b6766895f7d47fcad089b02790bcf29" into...

Merge changes from topic "am-6b6766895f7d47fcad089b02790bcf29" into tm-d1-dev-plus-aosp am: 9b9e6609

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



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