Merge changes from topic "revokeLocOnUpgrade"

* changes:
  Control revoke-on-upgrade behavior for loc perm
  Revoke location permissions on upgrade from Pre-Q
  No special case for location permission
  Inherit flags when inheriting permission state