[automerger skipped] Add ability for flags to be server-overridden. am:...

[automerger skipped] Add ability for flags to be server-overridden. am: 27195676 am: c36a556f -s ours

am skip reason: Merged-In I08166cb90675dea06b2671669cecfc16ac58ab61 with SHA-1 39083390 is already in history

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



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