am f7fc0631: Merge "Show location permission toggle for location provider" into mnc-dev

* commit 'f7fc063145df915b76c93945b2dd5e792d4cdd80':
  Show location permission toggle for location provider