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

This reverts commit 59b5421373eee8dca8eb544b6276d65f81b051a3.

Conflicts:
	core/java/android/provider/Settings.java