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':
  Fix dm-test invocation

Change-Id: I49e906cf9d37623b46ffd26a2edcd3f5876d0311