[automerger skipped] Merge "pm: Require manifest.json for .dm (dex-metadata) files." am: 3ad85e40 am: 4b06a33f am: 94e09fbe -s ours am: efa809ee -s ours am: e14ef17d -s ours

am skip reason: Merged-In I7a3c442bb27da5948bc9ead146c77213de6b56cc with SHA-1 12af11d6 is already in history

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

Change-Id: I83890703c2099947b3ed7bfe16b486ff3513385c