[automerger skipped] Merge changes I2867a158,I98de12b5 am: 81df5357e6 -s ours am: 3bdbdf590c -s ours am: c4ff8d7f13 -s ours am: e38ccc8356 -s ours

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

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

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