Merge changes from topic "cherrypicker-L22900030008737053:N91500030147082667"...

Merge changes from topic "cherrypicker-L22900030008737053:N91500030147082667" into udc-dev am: c8edd24f

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



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