Merge "pm: Require manifest.json for .dm (dex-metadata) files." am: 3ad85e407e am: 4b06a33f7b

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1587772

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If5333980d2af4d3d703fc7bbf1545214697c9841