Merge "Volume dialog touch-tracking is disabled when in zenMute." into oc-mr1-dev am: 0951dbd00d
am: d363e453e4

Change-Id: Ib78559f567c89489187c945535345c3ab9930972