Merge "AudioService: fix audio mode lock" into qt-dev
am: 469f1c90ed

Change-Id: I855cfaf0687b048bf674f1bd4589f006facf25fd