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

This reverts commit 2ced3c674d49cf26daeec2817b6a8da24524c365.
Custom carrier text (2/2)
same as the other commit

Change-Id: I34e8de1921dce740454101020a1f259cb89f02e2

Conflicts:
	core/java/android/provider/Settings.java
	policy/src/com/android/internal/policy/impl/keyguard/CarrierText.java