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':
  cherry-pick 0a0368368 Check the conformance requirements in Sec. 6.8.1.

Change-Id: Ib7be891ecd93d42f6102afb9713bd8e85169c9c3