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

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



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