Allow flags to be marked as overriden.

Bug: 233906828
Test: manual
Change-Id: If8d8cf39683db32295c73946c37b4a6d33bf63a0
3 files changed