[automerger skipped] Merge changes I2867a158,I98de12b5 am: 81df5357e6 -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: I49d2a8ed8d59c31636ae71526c138c70b2613f94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: