Merge "Merge "Release flag" into udc-dev am: ac4c6aa7 am: 14fc91e7 am:...

Merge "Merge "Release flag" into udc-dev am: ac4c6aa7 am: 14fc91e7 am: 1967e686" into udc-qpr-dev-plus-aosp am: b18f6bdb

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



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