Merge changes I4ea75eeb,Ifbbd7eee into udc-qpr-dev am: 6715256755

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

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