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

* commit '3237940a6c64ad0dff579d13e37468836880af81':

Change-Id: Ic653a9db8ab6681a6995e15c1499e8643845fc49