[automerger skipped] Merge changes I6892f028,I2e52c3ab am: 1d81f1e0 -s ours...

[automerger skipped] Merge changes I6892f028,I2e52c3ab am: 1d81f1e0 -s ours am: 9b4299f4 -s ours am: fcbe98c1 -s ours am: 31cdfa78 -s ours

am skip reason: skipped by user wonsik

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



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