Merge changes from topic...

Merge changes from topic "revert-23727772-b279054964-flag-api-udc-qpr-dev-YOBAYFNKLI" into udc-qpr-dev am: 20fb6e46

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



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