Merge "Revert "Revert "Update type in AnimatedNavHost""" into udc-dev-plus-aosp am: 96633835

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



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