Merge "Replacing overlapping flag value" into udc-dev am: e0a5db49 am: 9ad5b8e7 am: bbd30181

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



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