Merge "Merge changes If2d87039,Ia544cbbf into udc-dev am: cadaf0c5 am:...

Merge "Merge changes If2d87039,Ia544cbbf into udc-dev am: cadaf0c5 am: 31d0712c" into udc-d1-dev-plus-aosp am: 31d65346

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



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