[automerger skipped] Merge "Rename calls to isGlobalModeEnabled" am: b6fd42a06a am: c03048cd27 -s ours am: 902793ffa7 -s ours am: 8f14309c6a -s ours
am skip reason: Change-Id If302350cfea7b2cd2cd25906dd1dd6a6d192a5d6 with SHA-1 77dea1beb0 is in history
Change-Id: I9f17af1d0a16b58cd4f8ddf38f60c6d51512ae42
This commit is contained in: