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