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: Ied74f7822969dbf83223ff1e5bf208dc4abb0071
tree: f95263c33a855c69a499c737fe82a0ab9970ddd7
  1. Android.bp
  2. switcher4.py