Merge changes I313240f1,Ie2b830d0 into udc-qpr-dev am: ebe33c2c84 am: d25a1f4910

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

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