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

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

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



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