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