Merge "dexmetadata: add required manifest.json for .dm (dex-metadata) files." am: da06c71e69 am: bcbf41a7ab

Original change: https://android-review.googlesource.com/c/platform/cts/+/1587534

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib404b0daa376d6b7e17b0c8d07d97635ef15ee6a