Cleanup.

Revert import changes that are both unneeded and violate coding style,
fixup coding style for some of our additions and simplify code.

Change-Id: I25f00e3ab16bde939cf82b0d3a0bfb77b90ac836
Merge commit '2990f22f245e70b5e7b7270f52d65080b50eeb44' into android-4.4

Conflicts:
	src/com/android/phone/CallFeaturesSetting.java