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