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

Merge "Fix a ISA map bug. It puts the values to the wrong map." am: cd881a42 am: f45769ef am: a496490c

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

Change-Id: I7bee86c0af339e89e7a9844709b7aa2587912c12