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

Change-Id: If7360e29be2b7f35b705eaf152be09f7621887c5