Merge "Merge changes Ie75ef932,I424f96e2,Ieed66079,Ieee4b442,I3c94c963 into...

Merge "Merge changes Ie75ef932,I424f96e2,Ieed66079,Ieee4b442,I3c94c963 into udc-dev am: 1db1e6d0 am: 8e773c1d" into udc-d1-dev-plus-aosp am: c938868b

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



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