flo:       -add volume wake
           -enable global button settings

Change-Id: Icf7407b22fc9a62fa6a60f913988d2f1241b7cce
Merge "flo:       -add volume wake            -enable global button settings" into android-4.3