[automerger skipped] Merge "Add two fields on ART metrics (apk type and isa)." am: c5c002ca4b am: 47c9e85165 am: 041f00bb75 -s ours

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

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

Change-Id: Iaf2e2c0ba34909956a8c3b85d83eddb38e455475