Merge "Use symbolic name for return value in legacy audio policy client" am: e31f1491f8 am: d6229bb516
am: 95852cbbbb

Change-Id: I376781094ef5c565be1db23784636b7422b38ad8