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

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

Change-Id: I2da2701ceb512486d94d0914df8d10451412fca0