am c54a87e3: am 6b274720: GpsLocationProvider: Read data enabled status from TelephonyManager. automerge: 64ce5f8f automerge: ac46e824 * commit 'ac46e824':