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

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



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