Merge "Refactor audiopolicymanager_tests."
am: 4cabab17c4

Change-Id: I198941bcd4bd5df51c946c504ee7b4a1334a5ee1