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: I4e6c49fe447d8e0bf6388841b7ba05a1f630c879
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>