[automerger skipped] Merge changes Id6e00fac,I653584d5 into udc-qpr-dev am:...

[automerger skipped] Merge changes Id6e00fac,I653584d5 into udc-qpr-dev am: 1083c782 am: 2e36631c -s ours

am skip reason: Merged-In Id6e00facda2c4aed470f772741c1d492eebad17d with SHA-1 4123893f is already in history

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



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