Merge changes I7b329ef9,I0d297749 into udc-qpr-dev am: f7e849a1 am: e9f1ef5b

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



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