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

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

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



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