[automerger skipped] Rename isDataConnectionEnabled to isDataConnectionAllowed...
[automerger skipped] Rename isDataConnectionEnabled to isDataConnectionAllowed am: 504aee4e am: 96700d9e am: ed021859 am: a69f4c82 -s ours
am skip reason: Change-Id I29bf3e8431a2305b46a73415b701c7089f6a307d with SHA-1 504aee4e is in history
Change-Id: I53ec7168b762646342031a1f2b972a6392cac42c