Merge "Catch exception when getting PermissionControllerManager in PolicyService" into main