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

Merge changes from topic "am-bebd4b7ecee143699c7f9c2125e12a08" into tm-d1-dev-plus-aosp am: 876c0b7d

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



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