Per API guidelines - non-overlapping constants can be (should be) named with "FLAG". (cherry-pick ofad3693d59b, Change-Id: If8b2c0f9b2818215a64b5635e76731c8fdfd3b8d) Bug: 27122760 Change-Id: I973d24f4f318471286087e6ae13b77cb119f01e7 (cherry picked from commite698fab45c)