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':
  Correct paths in ValidateHalManifestTest.

Change-Id: I6f888a350b86ef04a2ae4e4a14434a2608ba171e