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

Change-Id: I2109113b136e56e222aaf8d6a359190e26dc2600