Merge "Fix intdefs that were incorrectly defining "flag"" am: 4ca6de77af

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

Change-Id: I5601d105714fe24fff39c434cedae8daa74bfb86