pyramid:overlay: Set proximityCheckOnWake to false
Merge https://github.com/ivanich/android_device_htc_pyramid into aospa-kk

Conflicts:
	overlay/frameworks/base/core/res/res/values/config.xml