Merge "Swipe for notifications should work when navigation occludes keyguard" into oc-mr1-dev
am: 3e3e05c933

Change-Id: I9322641eec548fb74dafffdb5250c94d3933a3e7