Merge branch 'kitkat' of https://github.com/AOSPA/android_frameworks_base into kitkat

 PS2: add back lost commit 28b10b30d6a1353688ca54f61cf7f7c9df85878d from recent merges
      Default EdgeGestureService to off
      We set this to off by default in Settings but forgot to do so here which was causing derps

      Change-Id: I152792275bf7438a71942be87d580894064d0a78

Change-Id: I9b9a0199268de579a9f236ea7b813fb718d286db
Signed-off-by: houst0nn <houstonn@gmail.com>