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

* commit '12b05ec2e7a22fa0cbc1bc55d5a8b6503dbf038c':
  Grant default permissions to the setup app robustly.