PA update

Conflicts:
	packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyButtonView.java

Change-Id: If124bc8da6c67563dbf43b99349fda280ce747f3