Merge changes Icc35293f,I05ed15cd into udc-qpr-dev am: d9b21f6fa5

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

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