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

Merge changes from topic "am-aa77a759ba8a4c3796b92d85a0fb196b" into tm-d1-dev-plus-aosp am: 6dc437fb

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



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