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

Merge "Replacing overlapping flag value" into udc-dev am: e0a5db49 am: 52ca1aac am: c2176181 am: 93665ac2

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



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