Merge changes I0eaf7473,Ib31a9bcb into udc-qpr-dev am: 7e79f078 am: b527796d

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



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