Merge "Add isDataEnabled in PhoneInterfaceManager." am: a024233d05 am: 5be242e872
am: f7f3cffc7d  -s ours

Change-Id: Iaee0b5fe6a063abf9b7a21e06a07486c30df0aa6