[automerger skipped] Rename isDataConnectionEnabled to isDataConnectionAllowed...
[automerger skipped] Rename isDataConnectionEnabled to isDataConnectionAllowed am: 504aee4e -s ours am: be4f3a6a -s ours
am skip reason: Change-Id I29bf3e8431a2305b46a73415b701c7089f6a307d with SHA-1 504aee4e is in history
Change-Id: I9344c811ed75e91489b5d39f02e1843e3eb24a7e