Merge changes Iaf91e560,Ib40dcf0a into udc-qpr-dev am: cac31846bb

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

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