Ensures errors are correctly attributed to ad or content#2655

stevemayhew wants to merge 3 commits intoandroidx:mainandroidx/media:mainfrom

stevemayhew:p-fixes-ad-error-handlingstevemayhew/media:p-fixes-ad-error-handlingCopy head branch name to clipboard