Merge changes I02fb643b,If62d66bc into udc-dev am: b9de8fb7 am: 8104694f am: 04bf9667 am: 4f8bfa73

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



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