am 00abc03c: resolved conflicts for merge of 0689fe99 to klp-modular-dev

* commit '00abc03ce204c8567206882e5d802ad7fbb7db9f':
  DO NOT MERGE. Rearrange dialpad layout for better esthetics.
tree: bfbbce2fdd7a3c3af986d37fbae1bb0a6ee98c1d
  1. InCallUI/