Merge changes from topic "cherrypicker-L35800000961165098:N58500001377174291"...

Merge changes from topic "cherrypicker-L35800000961165098:N58500001377174291" into udc-dev-plus-aosp am: 938f3aa9 am: 395a8f7c

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



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