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':
  verify embedded buffer matches address in parent

Change-Id: I60d8a877671d2715ac40e98b2a2cf21dd8fe63e6