Forward Port: Hide USB Debugging Icon [1/2]

Change-Id: Ibd63a9df207ddfb67dc16fbd44697261a9f6f0b4
Frameworks: : ADB_NOTIFY moved to Global

Change-Id: I3f32b1c241ed23409661ce7b45530fec4b082088
environment: return external dir if secondary is not defined

If the device doesn't define a secondary storage, then return external storage
as secondary storage

Patchset 2: do not break the api

Change-Id: I9d94a01881f47977ef1a26c3648b3da1d8c63b57
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
Merge remote-tracking branch 'upstream/lp' into lp
Merge branch 'lp' of https://github.com/AOD-LolliBeans/android_frameworks_base into lp
Forward Port: Hide USB Debugging Icon [1/2]

Change-Id: Ibd63a9df207ddfb67dc16fbd44697261a9f6f0b4

Conflicts:
	services/usb/java/com/android/server/usb/UsbDeviceManager.java