Merge "Allow sysui navigation to work when application occludes keyguard" into...
Merge "Allow sysui navigation to work when application occludes keyguard" into nyc-mr1-dev am: aea8efbc
am: 37f4d361
Change-Id: I7219c0eb990054c37261380dc4378d05785efb92