Merge "pm: Require manifest.json for .dm (dex-metadata) files." into sc-dev am: 9c28f970 am: 69d01ec7

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

Change-Id: Ib1fd9415e2b79b7969331f326ed26ba09eeed221