[automerger skipped] Merge changes I10ab56a8,I7e437c3d,I0413c52f am:...

[automerger skipped] Merge changes I10ab56a8,I7e437c3d,I0413c52f am: bece5974 am: 3979981b am: 70d4f9ab am: 70833656 am: a47bb4fa -s ours

am skip reason: Change-Id Ibb50fb1d05e52be76a63dbf95884b788965eb979 with SHA-1 828dc724 is in history

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

Change-Id: I303cc037ef625deafef8e72cfb6ebf5f00e52e5b