am 75f6b94a: Merge "Grant default permissions to the setup app robustly." into mnc-dev

* commit '75f6b94a5d5cadb218725011729466e8e438b231':
  Grant default permissions to the setup app robustly.