[automerger skipped] Merge changes I7ae7dac9,Ie142cac2 into udc-qpr-dev am:...

[automerger skipped] Merge changes I7ae7dac9,Ie142cac2 into udc-qpr-dev am: 7bffb9ff am: 768f8df2 -s ours

am skip reason: Merged-In I7ae7dac97b0a148264075a942c77995a5a097d61 with SHA-1 c81e0b5f is already in history

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



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