Merge changes from topic "am-7692172354ef491dbc6bc38caaa00c05" into...

Merge changes from topic "am-7692172354ef491dbc6bc38caaa00c05" into tm-d1-dev-plus-aosp am: e9d9e8a7 -s ours

am skip reason: Merged-In I025245b2a6f8cfaca86f268851a9d8f0817e07dd with SHA-1 d54a48f4 is already in history

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



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