Merge "Add audioserver to wakelock group."
am: 9f877cf5c9

Change-Id: Iee099c9fa96ea90dd076fc6e2d25f344975c5d0b