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