Merge tag 'android-11.0.0_r48' of https://android.googlesource.com/platform//frameworks/av into r

Android 11.0.0 Release 48 (RD2A.211001.002)

Change-Id: I4bbe883091b412cdaecc4927547ae0c7df5b0af0