[automerger skipped] Merge changes I1476a938,I111189d1 am: b4eec7fc am:...

[automerger skipped] Merge changes I1476a938,I111189d1 am: b4eec7fc am: b566792e am: 89b3c779 am: ae6e1a92 am: d17adc97 -s ours

am skip reason: Merged-In I1476a9381e797905d9b2456282cf0eb78d51a304 with SHA-1 aa771b56 is already in history

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



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