Merge changes from topic "am-42bfc4e9e925412abde60152207beaf7" into...

Merge changes from topic "am-42bfc4e9e925412abde60152207beaf7" into tm-d1-dev-plus-aosp am: 312f5e4f -s ours

am skip reason: Merged-In Iade04ede17b9371e530556acb2bd84c4b57c1581 with SHA-1 63b2a309 is already in history

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



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