Merge "Allow sysui navigation to work when application occludes keyguard" into nyc-mr1-dev
am: aea8efbc11

Change-Id: I0a8e6a0ad2f7d0b28dc668bab9bed6928b871620