am cf8ec275: am 1aaad610: Merge "Do not hold a lock when calling API to grant default permissions" into mnc-dev

* commit 'cf8ec27503c07c353f543eb527e6306abd88d461':
  Do not hold a lock when calling API to grant default permissions