Merge "Replacing overlapping flag value" into udc-dev am: e0a5db49 am:...

Merge "Replacing overlapping flag value" into udc-dev am: e0a5db49 am: 52ca1aac am: 392155ff am: 3e6de52b

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



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