Merge "Tweak updateAZR so that supplying null ZenDeviceEffects behaves the same as null ZenPolicy" into main