Merge tag 'android-11.0.0_r48' of https://android.googlesource.com/platform//packages/apps/Bluetooth into r

Android 11.0.0 Release 48 (RD2A.211001.002)

Change-Id: I20a46036b69784b50b327be1df5109c784a9838f