Merge changes from topic "am-728b609d91cf47cca8425e67423cd568" into...

Merge changes from topic "am-728b609d91cf47cca8425e67423cd568" into tm-d1-dev-plus-aosp am: 29ff243f -s ours

am skip reason: Merged-In Ic2fa8f06cc7a4c1f262115764fbd1be2a226b4b9 with SHA-1 7059638b is already in history

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



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