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

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

Change-Id: Ie39f4716c509672628522232471311ccb6a4d609