am 52720f45: Merge "Use LOCATION_HARDWARE permission for data injection." into mnc-dev

* commit '52720f45098e9aed57c906e64a13e4a4a2173ce8':
  Use LOCATION_HARDWARE permission for data injection.