Revert "Merge commit '7a99024' into merge"

This reverts commit 89f47128418dbb4541893b93d32769f359317347.

Change-Id: Ica763915fd0b5840eff5a4dfa61f49717e3b3367
tree: 4bd60727e0f78803e27527df88a9a6f6980c998e
  1. InCallUI/