Merge changes from topic...

Merge changes from topic "revert-24024260-revert-23727772-b279054964-flag-api-udc-qpr-dev-YOBAYFNKLI-PCQCGMBGDA" into udc-qpr-dev am: b5f03791

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



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