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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3d8da5f999b75a05ce45d2d2fe31e5e0fa0b792f