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 property_contexts from private to public.

Change-Id: I756278967fc11e3457495c7cc01b18f261fc0b80