Merge branch 'cm-11.0' of https://github.com/temasek/android_frameworks_base into HEAD

Conflicts:
	core/java/android/view/IWindowManager.aidl
	core/java/android/view/WindowManagerPolicy.java
	core/java/com/android/internal/util/cm/QSConstants.java
	core/res/res/values/cr_strings.xml
	core/res/res/values/cr_symbols.xml
	packages/SystemUI/res/layout/quick_settings_tile_equalizer.xml
	packages/SystemUI/res/values-hdpi/config.xml
	packages/SystemUI/res/values/cr_dimens.xml
	packages/SystemUI/res/values/cr_strings.xml
	packages/SystemUI/src/com/android/systemui/quicksettings/QuickRecordTile.java
	packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
	packages/SystemUI/src/com/android/systemui/statusbar/CommandQueue.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
	policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
	services/java/com/android/server/wm/WindowManagerService.java
	tools/layoutlib/bridge/src/android/view/IWindowManagerImpl.java

Change-Id: Ief1971fb73775dbe4f0e31a261272db5620dfa23
remove duplicates

Change-Id: Ib74a89ff2d8187efea704539a9113c934715ce8d
why did the unneeded files come back?? remove

Change-Id: I7ad57101db601e4ac997c9076746e6d0350ab196
fix another derp

Change-Id: Ib7a4c07708b450363039125dfebc301fcbe42441
UsbDebuggingManager : Handle race condition when toggling rapidly

When toggling adb enable/disable rapidly, you can have the situation where the thread's
run() gets invoked but mAdbEnabled is already set to false, hence listenToSocket() never even
gets invoked in which case mOutputStream/mSocket are both null. This patchset adds checks
around that.

Change-Id: Iba56e7409435e22d690432fa663bc0a04a1a447d

Conflicts:
	services/java/com/android/server/usb/UsbDebuggingManager.java
CameraTile: Launch default gallery app when long pressing active camera tile

Currently long pressing this does nothing. It makes sense to launch the default
gallery app from here if a user long presses in order to see pictures that
they've taken from the smaller camera preview.

Change-Id: Iad73a291443eb2a12e1399f24eeeec61ec945bf5
GlobalProxy : Add api to allow for apps to set a global proxy

Change-Id: I29465cc4d43e84cbdb797d2e590c2208cd564663