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

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



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