am c54a87e3: am 6b274720: GpsLocationProvider: Read data enabled status from TelephonyManager. automerge: 64ce5f8
automerge: ac46e82

* commit 'ac46e8240470eefbfebb852906a1972ee5faf4db':