Merge "Merge "Fix memory leak via ZenModeController callbacks." into nyc-dev am: 30e434a996 am: 480cb05866" into nyc-mr1-dev-plus-aosp