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

Android 11.0.0 Release 48 (RD2A.211001.002)

Change-Id: Ib9a186ac2961096b7bd0cc49ceb795bd135140cb