Revert "Merge commit '8bd143b' into merge"

This reverts commit 0a1a5c471392caaffedeacb56f784f07c1130a10.

Change-Id: Ie74b7bd035a5c7a28ee066fb280185e0385d3353
tree: 721ef5cfb97956de98dde31c1c45bc2e4d3c144b
  1. InCallUI/