Merge "Merge "Announce when volume controls appear and disappear." into nyc-dev am: c14996393a am: 767c3e0df1" into nyc-mr1-dev-plus-aosp