Merge changes I8da85eb9,I5f91a776 into udc-dev am: 22632e0ff4 am: b4d5265f44 am: 459e410025 am: 3a1fda9c1e

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

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