Merge changes Ieb3493f2,Iff1926d2 into udc-qpr-dev am: 83b7fafe23 am: 80b44f6ef5

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

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