Merge changes I02fb643b,If62d66bc into udc-dev am: b9de8fb7 am: ca1d9c1a am: 26aa7846 am: 20487197

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



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