[automerger skipped] Merge changes I46fb8cfe,I4181b465,I99e1ca1d,I66b09693 am: aa6698b0b4 am: 16aa1bcc9f am: 4f3dc5372a -s ours

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

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

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