Merge changes from topics...

Merge changes from topics "cherrypicker-L54100000962329329:N46400001393040350", "cherrypicker-L59600000962264727:N16700001392121090" into udc-d1-dev am: ea60247f am: e8bb4c51

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



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