Merge "Add two fields on ART metrics (apk type and isa)." am: c5c002ca4b am: 47c9e85165

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

Change-Id: Ia450ff1b9869261ab1736d7577948ffb99c6f172