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

* commit '9088c083e6c66d44d3fe332de48b661dfe017254':
  Grant default permissions to the setup app robustly.