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

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

Change-Id: I5bbee21118b641613313eee0191a738eea83e51c