Revert "[3/3] InCallUI: allow disabling non intrusive incall ui"

This reverts commit 4aa2c93afbb291db19929bf1758adcca98d3edc3.
Merge remote-tracking branch 'origin/cm-11.0' into cm-11.0