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

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

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