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

Android 11.0.0 Release 48 (RD2A.211001.002)

Signed-off-by: Jackeagle <jackeagle102@gmail.com>
Change-Id: I395bc0569c244ff0f47476405bd8e11bad8fe795