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

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

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