Merge "Add isMobileDataEnabled in TelephonyManager." am: ed7eead23b am: 6b943d5deb
am: 904340088a  -s ours

Change-Id: Id32dd08ebec6e0f90a08a360ce1b6488adbeab40