Merge the 2021-06-05 SPL branch from AOSP-Partner

* security-aosp-pi-release:
  Do not accept vdex with dex sections from .dm files

Change-Id: Id74cc616f64eda8bfcc20a88d1708d1fd4b9183e