Forward Port: Hide USB Debugging Icon 1/2
PS2: code style, now on the fly
Change-Id: I459b6172540ad1f9f74289dcbe61abaf417c1b30

Change-Id: I459b6172540ad1f9f74289dcbe61abaf417c1b30

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