Revert "Merge commit '87caa7e' into merge"

This reverts commit a5614723fe6be0e66dc038db90fdf5af32c8fc4b.

Change-Id: I5641c6e7f6aa83795056c3360b7d0c2c538b75cc
tree: fabdc816a435f7a07c0ac30bcd3b8abd4868935e
  1. InCallUI/