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

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



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