Merge changes from topic "am-c5837cdcefcc4c69b9fdc303747baa68" into udc-dev am: a3000c14 -s ours

am skip reason: Merged-In I52185f74ae8d28b379440235ca6f03c5089081f5 with SHA-1 16af3e02 is already in history

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



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