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

Change-Id: If3c3802274ebdcc83a3d653b03c77764eee3e100