[automerger skipped] Merge "audioservice: do not show volume panel when system audio is on" am: 102b795b61 am: f73668be43 am: 860674f08a
am: 3333a5ea71 -s ours
am skip reason: change_id Id8730455ee79f0ea3fa4c23e0a8b6bd2791eb2d3 with SHA1 bd9cbe355f is in history

Change-Id: I2d2c057b0ac1e7241c254b09a8afea399bbc6be7