am cabe7e82: Merge "Settings app supports location settings injection" into klp-dev

* commit 'cabe7e821886f560e2bff7d2528069308458dc98':
  Settings app supports location settings injection