Revert "Workaround for java.lang.IllegalArgumentException in android.util.ArrayMap"
am: 7dda10ed2f  -s ours

* commit '7dda10ed2ffa4f94dead96635e83e78aa64301ca':
  Revert "Workaround for java.lang.IllegalArgumentException in android.util.ArrayMap"
tree: c488feec0b6564a6e53b33081dd55a0e27edc44f
  1. InCallUI/