Port "Option to hide Adb notification icon (2/2)"

Change-Id: I5d40f5b0990fa3a1d02210ad4cc2ff5ada15e69c

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