Merge "Fix NPEs in DevicePermissionPolicy." into main