Merge changes If58bf46a,I6b378499 into udc-qpr-dev am: 9a5214d948 am: e0d8e395e7

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

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