Merge changes I01dbdd8a,Ib78b3c35 into udc-dev am: 687f69993f am: 58f2206bfb

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

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