[automerger skipped] Revert "Revert "Update type in AnimatedNavHost"" am: 8d59a527a0 -s ours am: 0b9294f580 -s ours am: 3eb66b1a51 -s ours am: df77ba59b5 -s ours

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

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

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