Merge "Move VDM initialization from PermissionManager constructor to the caller" into main