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

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

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