[automerger skipped] Merge changes I099c8315,I21e958d3 am: 6317dae7 am:...

[automerger skipped] Merge changes I099c8315,I21e958d3 am: 6317dae7 am: dddfa2a3 am: 7d58cbb7 -s ours

am skip reason: Merged-In I099c83155456139729f4d73f5873a172590ee7e9 with SHA-1 4dd9540f is already in history

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



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