Merge changes I01dbdd8a,Ib78b3c35 into udc-dev am: 687f6999 am: 58f2206b...

Merge changes I01dbdd8a,Ib78b3c35 into udc-dev am: 687f6999 am: 58f2206b am: 238dcfd5 am: 2123c1a6

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



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