Merge changes I8da85eb9,I5f91a776 into udc-dev am: 22632e0f am: d796ce69 am: 0fb2bd88 am: ad201cb4

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



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