Merge "Permission grant tests for legacy apps" into mnc-dev