Merge "Don't factor animating-to-sleep for nav bar visibility" into sc-qpr1-dev am: efe1d4bffe am: f192e7eed0

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

Change-Id: I4a415d2991da3f390073d9a7dbd9497318216179