volume rocker wake: Clean up [1/2]

This reverts commit 1efcfe5f945c42d6f3353aa4d3b65e0c6af0b578.

Conflicts:
	core/java/android/provider/Settings.java
SystemUI: fix right hand side gestures on lockscreen

two finger quick pulldown was not accounting for being in the keyguard
adn was eating touch events when it shouldn't be.

Change-Id: I625d48a4002aaaf2d55d7efaed65d892ab7aa13c
Signed-off-by: Roman Birg <roman@cyngn.com>
Revert "Squashed: Add options for reboot to recovery and reboot to bootloader"

This reverts commit c32039b83120820081ad18cedb6b56d200d765de.
Power menu reboot options

Change-Id: Ic5fd03dc06c807a1199f8b9359e4eab8e3d9ecef

Conflicts:
	core/res/res/values/strings.xml
	core/res/res/values/symbols.xml
	services/core/java/com/android/server/power/ShutdownThread.java

Conflicts:
	core/res/res/values/symbols.xml

Conflicts:
	core/res/res/values/symbols.xml
Filter spam notifications

Change-Id: Ibf2377cd7491c7e0e9e9c9657e9e65eef1876ee3