Merge "Merge changes I8da85eb9,I5f91a776 into udc-dev am: 22632e0f am: d796ce69 am: dcc8804c" into udc-qpr-dev-plus-aosp am: b7b1ceaa

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



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