Merge "Fix regression from ag/22534576" into udc-dev am: 1b25aefa am:...

Merge "Fix regression from ag/22534576" into udc-dev am: 1b25aefa am: 34f775cb am: 2cc92f03 am: 47cceeb9

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



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