Merge changes from topic "b279054964-flag-api-udc-qpr-dev" into udc-qpr-dev...

Merge changes from topic "b279054964-flag-api-udc-qpr-dev" into udc-qpr-dev am: 44f28146 am: dc1c7737

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



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