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

Change-Id: Ibe9c65f1fe024a859d98d96fd86199607a1060de

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