Merge "Fix regression from ag/22534576" into udc-dev am: 1b25aefa am: 34f775cb am: 2266dea9 am: def62583

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



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