Merge "Fix tuner DND UI" into oc-mr1-dev
am: 5285e053b3

Change-Id: Ic82ecc1588f79d49a78df63998633464c3f6dabc