[automerger skipped] Merge changes I995a059c,Ibf78c90b into udc-qpr-dev am:...

[automerger skipped] Merge changes I995a059c,Ibf78c90b into udc-qpr-dev am: fc7d9f4b am: d5df7e1b -s ours

am skip reason: Merged-In I995a059c6575298eeae095fb3daa9f037916014a with SHA-1 f0c835c6 is already in history

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



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