[automerger skipped] Merge "API Review: rename isGlobalModeEnabled" am: 8e1c444d07 am: 7567c1aa52 -s ours am: 9a0056d833 -s ours
am skip reason: Change-Id Ia23e47047bb8e79e528ba2e37b8ab67e17af1ec7 with SHA-1 927caf9ff8 is in history
Change-Id: Ifdf26c3d17b5c2f8c576f7c2b234949cfc1678d1
This commit is contained in: