Merge changes from topic "am-21510c2d16214a77a05fe80906d96f6a" into...

Merge changes from topic "am-21510c2d16214a77a05fe80906d96f6a" into tm-d1-dev-plus-aosp am: a03a758b am: 9afa5679

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



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