automerge: cce8db2 * commit 'cce8db2c31a03d0c4e04f5851415d37032ae6621': Revert "GpsLocationProvider: Read data enabled status from TelephonyManager." as it reintroduces b/18922524
automerge: cce8db2 * commit 'cce8db2c31a03d0c4e04f5851415d37032ae6621': Revert "GpsLocationProvider: Read data enabled status from TelephonyManager." as it reintroduces b/18922524