Forward Port: Hide USB Debugging Icon 2/2

Change-Id: Ide823f42070b7b472308658fc85efb5b43f83b01

Conflicts:
	res/values/strings.xml