IconPackHelper: Don't respect an icons original size if too large.

  - Otherwise, if an application isn't following app icon guidelines,
  it can create an OOM situation when creating the new icon based
  on the original resource's height and width.

Change-Id: I9430445da5e393cdbf76ed9ebd9698bf30df6a95
(cherry picked from commit 88c7ee896bbc946487714a08992480ccb1da626e)
Automatic translation import

Change-Id: I5927a950623fb5ceea027632657880a591cf67af
(cherry picked from commit 50f1e2e2af4b6a2ac084afd98cd0292933f9f173)
ProximityWake : Add support for checking proximity when waking device

Change-Id: Ia5ff446d88435773acccc7467e66009000dc20cb

Conflicts:
	core/java/android/os/IPowerManager.aidl
	core/java/android/provider/Settings.java
	services/java/com/android/server/power/PowerManagerService.java

(cherry picked from commit c98d81041e989f44a015f0bbf1b3965d47e147bc)
Framework : Fix proximity wakeup reference

Change-Id: Ia40ca6fbf6e37fbb3996f2384f725c30b88c2131
(cherry picked from commit 17878988b29fc6a17f9485ecc23beb29b9fe952d)
core: Fix permission string

Should always start with lowercase

Change-Id: I5ab97b8a6ca67c4d2460f606f09b4bed8c299401
(cherry picked from commit 3a3031f28f3ca2ba8d81c672fd5ddf667b433d2e)
fb: do not block home button if incoming call is a background call

The user want to navigate ahead if it is a call in background.
So we allow it.

Change-Id: If40b8abba05b600191bfc1403f197e624fd7a360

Conflicts:
	policy/src/com/android/internal/policy/impl/PhoneWindowManager.java

(cherry picked from commit 842ff152bfd79a24effe6e0c59c40712dac55def)
SystemUI: fix hidden clock style after a reboot

Selecting hidden clock style and rebooting the device results
in both center and default clocks appearing when you'd expect
to see none.

mClockView is null after a reboot so visibility gets never set.
Set default visibility for clocks to gone.

Change-Id: I533af8c28042a5989e0025df133c9ccf1fa3e066
(cherry picked from commit 28a5f8f4fc47e9623327caa5a4a642f8c17569b1)

Conflicts:
	packages/SystemUI/res/layout/msim_status_bar.xml
	packages/SystemUI/res/layout/status_bar.xml