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

Change-Id: I1102631d4bcd83d84a5d299b61941d2f5037c1e3