Merge "Account for last animated-to-sleep state when calculating nav visibility" into sc-qpr1-dev am: ac32f8b8 am: e0cb0b89 am: 6addbb65

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15838491

Change-Id: I8b18d22debad256c1b30316c13377da36d7173f9