Merge changes I33e247b6,I27f8f209 into udc-qpr-dev am: b89d421074 am: f3003485c2

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

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