Merge "AudioPolicy: fix test API for focus policy" into qt-dev
am: 848eab444c

Change-Id: I3e33fb238b1f410bbeb06f8d22f06149ad126501