Merge changes from topic "am-4b34070f76684c3f8a701fe4e6c422d5" into...

Merge changes from topic "am-4b34070f76684c3f8a701fe4e6c422d5" into tm-d1-dev-plus-aosp am: c87cc6ed -s ours

am skip reason: Merged-In I35daf9a24f546ae25a78a2d841be39072cdc5641 with SHA-1 34f2ef77 is already in history

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



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