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

Android 11.0.0 Release 48 (RD2A.211001.002)

Change-Id: I41c4a5f87d55caac1cbd0df19948e565bdbde70f