Merge changes If5f4a7b4,Ie58b6947 into udc-dev am: 7c41bf2e

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



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