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

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



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