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

[automerger skipped] Merge "Revert "Revert "Update type in AnimatedNavHost""" into udc-dev-plus-aosp am: 96633835 am: dec41899 -s ours am: f4ee60d2 -s ours

am skip reason: Merged-In I057a43d5bf64ad602d822991ad1a688aee5f2bc7 with SHA-1 07596e3f is already in history

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



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