Merge \"Persist master volume mute across reboot\" into nyc-mr1-dev
am: 0df1d34e6e

Change-Id: I999fbc3df54108387b96bcc009c9bc8befb438c5