[automerger skipped] Merge changes I2867a158,I98de12b5 am: 81df5357 -s ours...

[automerger skipped] Merge changes I2867a158,I98de12b5 am: 81df5357 -s ours am: 3bdbdf59 -s ours am: c4ff8d7f -s ours am: e38ccc83 -s ours am: 9a59a0ed -s ours

am skip reason: Merged-In I2867a15840a0987c948179e2f8069e652c4a0c1f with SHA-1 6db81c15 is already in history

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



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