Merge "Merge "Add traces around updateZenModeConfig" into udc-dev am: 3ce065cc2a am: c27a6fd6b7" into udc-d1-dev-plus-aosp