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

* commit 'b05c48212220248a66dccac43405cad0f9b75ff3':
  Use LOCATION_HARDWARE permission for data injection.