Merge changes I01dbdd8a,Ib78b3c35 into udc-dev am: 687f6999 am: 5fca7e97...

Merge changes I01dbdd8a,Ib78b3c35 into udc-dev am: 687f6999 am: 5fca7e97 am: 1f3d8d10 am: 784298a4

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



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