[automerger skipped] Merge "Revert "Revert "Update type in AnimatedNavHost""" into udc-dev-plus-aosp am: 96633835d0 am: dec418991a -s ours
am skip reason: Merged-In I057a43d5bf64ad602d822991ad1a688aee5f2bc7 with SHA-1 07596e3f72 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23816643
Change-Id: I1368c8b161f2ec19d946eac54c108136db8f4919
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: