am 1c2cf214: am 0d07846f: Merge "Use LOCATION_HARDWARE permission for data injection." into mnc-dev

* commit '1c2cf214eec147ca1635bdfd4d837e1293b73003':
  Use LOCATION_HARDWARE permission for data injection.