Merge changes from topic...

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

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



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