Merge changes If8cf0831,Ib3203643,I8e7455dd into udc-dev am: 3fdc0c48 am: 1d2ed15a am: f2844948 am: 211b46b9

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



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