Merge tag 'android-11.0.0_r48' into int/11/fp3

Android 11.0.0 Release 48 (RD2A.211001.002)

* tag 'android-11.0.0_r48':

Change-Id: Id74ec5bbb5fcf5f12dd52c1d9e6e9969f2b0e1c6