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

Merge changes from topic "am-b1b3f9c284b743fab772298618b81119" into tm-d1-dev-plus-aosp am: 761e2b0c -s ours

am skip reason: Merged-In I7d0f8d2f6af4bc4210060f0a44469db2afc7a1bb with SHA-1 e4e77f45 is already in history

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



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