[automerger skipped] Merge "Account for last animated-to-sleep state when...

[automerger skipped] Merge "Account for last animated-to-sleep state when calculating nav visibility" into sc-dev am: 457af020 -s ours am: 808922b9 -s ours am: 914e13f7 -s ours am: f7730047 -s ours

am skip reason: Merged-In I6d3f7f92be567bb561f8cfc62a367c97b00c799d with SHA-1 4df879db is already in history

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

Change-Id: Id6c9feeff4073c6b428a6b26e9f14c9827e00b3e