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

Change-Id: I86bd4b46f031004fa90f1d7936263f9dabcd3860

Conflicts:
	src/com/android/incallui/InCallPresenter.java