Merge "Prevent apps from supplying non-public ZenDeviceEffects" into main