Merge "AudioFocusTest: modify for P behavior"