Merge changes from topic "am-83bac3d34ccd4f0bb22b0630af454684" into...

Merge changes from topic "am-83bac3d34ccd4f0bb22b0630af454684" into tm-d1-dev-plus-aosp am: c583b2b4 -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: I1a16e7c5e3563171f21c4faaa4f24987f40f3360
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>