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

* commit '5d2d9baa01c06ff8f247419eb3b66e8e21844b28':
  Show location permission toggle for location provider