[automerger skipped] Merge "Revert "Revert "Update type in AnimatedNavHost"""...

[automerger skipped] Merge "Revert "Revert "Update type in AnimatedNavHost""" into aosp-main-future am: cfcad9c2 -s ours am: 876446b1 -s ours am: 8b2d61eb -s ours

am skip reason: Merged-In I057a43d5bf64ad602d822991ad1a688aee5f2bc7 with SHA-1 65f2c18d is already in history

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



Change-Id: I1db900c4e230ee5b58b1a50e68556f38f488bdd3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>