[automerger skipped] Merge "Allow flags to be marked as overriden." into tm-qpr-dev am: d41926b3 am: 05a3e799 -s ours

am skip reason: Merged-In If8d8cf39683db32295c73946c37b4a6d33bf63a0 with SHA-1 33779871 is already in history

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



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