Merge "Switch VDID to persistentDeviceId in the caller of permission API" into main