Merge "Merge "Make DND tile primary toggle remember favorite zen" into oc-dev am: 46398517 am: df8c9181" into oc-dr1-dev-plus-aosp