Merge changes from topic "cherrypicker-L84000000961835147:N85300001385845465" into udc-dev am: 76eed81379 am: 2367dc86d7

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

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