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

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

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