[automerger skipped] Merge "Refactor audiopolicymanager_tests." am: 4cabab17c4 am: 23cfd8cc5b
am: 7efcebd101 -s ours
am skip reason: change_id Idf6d76bc78a74b56eb55bc7b9458bebba8f367d8 with SHA1 7c0205ea95 is in history

Change-Id: I6b33e81fa723618ffb37f145246e9bd36a2349f8