Merge "Fix flakiness in testDangerousPermissionStateSampled." into rvc-dev