Merge changes Iad0e57ad,Ic7b22864,Id99218c4 into udc-dev am: be6894b006

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

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