am 954f5f2e: am 711f8a17: Merge "Revert "Show location permission group, even when fixed."" into mnc-dev

* commit '954f5f2ed1c7ff288ba9f4686bdee93860d02720':
  Revert "Show location permission group, even when fixed."