[automerger skipped] Merge changes I46fb8cfe,I4181b465,I99e1ca1d,I66b09693 am:...

[automerger skipped] Merge changes I46fb8cfe,I4181b465,I99e1ca1d,I66b09693 am: aa6698b0 am: 16aa1bcc am: 4f3dc537 -s ours am: 3c1bcfa4 -s ours am: 66e37f67 -s ours

am skip reason: Merged-In I46fb8cfe2825c2c26207b79965fbbace41fc7793 with SHA-1 28ab303d is already in history

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



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