Merge "Fixed audioserver crash in monkey test"
am: db44c5d13b

Change-Id: I762f87f3a8dae3588c850ba4a780748f1e749684