[automerger skipped] Merge "Add two fields on ART metrics (apk type and isa)."...

[automerger skipped] Merge "Add two fields on ART metrics (apk type and isa)." am: c5c002ca am: 47c9e851 am: 041f00bb -s ours am: 9fc14a22 -s ours

am skip reason: skip tag Change-Id If7a45b263c507e05801117eea85ab610f869c482 with SHA-1 b5789014 is already in history

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

Change-Id: I7773232c0983b16be20edad55b16550b15f815d0