Merge "Merge "Make DND tile primary toggle remember favorite zen" into oc-dev am: 463985178c am: df8c918129" into oc-dr1-dev-plus-aosp
am: 910563fca0

Change-Id: Ie5c45ad427a6faf60956828389e6194bd162756b