Merge "Merge "Release flag" into udc-dev am: ac4c6aa7" into udc-d1-dev am: 3df3db92

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



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