Merge changes I01dbdd8a,Ib78b3c35 into udc-dev am: 687f69993f am: 5fca7e97b4 am: 1f3d8d1015

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

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