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

Merge "Merge "Release flag" into udc-dev am: ac4c6aa7 am: 14fc91e7" into udc-d1-dev-plus-aosp am: 435b5d7d am: 1949c148

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



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