Merge "Remove @SystemApi from inherited methods of AudioFocusInfo"