Merge "Refactor audiopolicymanager_tests." am: 4cabab17c4
am: 23cfd8cc5b

Change-Id: I0c77c75fa15d7063072cbed52303a38caa302b8a