[automerger skipped] Merge "Rename calls to isGlobalModeEnabled" am:...
[automerger skipped] Merge "Rename calls to isGlobalModeEnabled" am: b6fd42a0 am: c03048cd -s ours am: 902793ff -s ours
am skip reason: Change-Id If302350cfea7b2cd2cd25906dd1dd6a6d192a5d6 with SHA-1 77dea1be is in history
Change-Id: Iab8f4ddeb21032e44ee74cc18db2b5fd5e3d1cb5