Merge changes Ia9d5b620,I49577bc7 into udc-qpr-dev am: c358f7fb23 am: 22b3a14ea1

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

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