Merge "Revert "Revert "Update type in AnimatedNavHost""" into aosp-main-future