[automerger skipped] Merge "Move setDataRoamingEnabled to DataEnabledSettings"...
[automerger skipped] Merge "Move setDataRoamingEnabled to DataEnabledSettings" am: ef9e5a29 am: fa7a8466
am: f250abda -s ours
am skip reason: change_id If14836ccbdee35fbbb025dd7f00b15ebd8098d33 with SHA1 3ec6840e is in history
Change-Id: I3cecbba1e45e30c7825f2e2f262b71ca407f4a6b