Merge "Fix a ISA map bug. It puts the values to the wrong map." am: cd881a42b6 am: f45769ef87

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

Change-Id: I91425fa55b4ea28c35d50c905492284c4d10ddff