Merge changes from topic "am-c7806d5e030b4442bbb1bcc61a98bff0" into tm-d1-dev-plus-aosp am: 4adb44be am: d98e8af5

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



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