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

[automerger skipped] Merge "Revert "Revert "Update type in AnimatedNavHost""" into udc-qpr-dev am: 0870eea4 am: 3c70956d -s ours

am skip reason: Merged-In I057a43d5bf64ad602d822991ad1a688aee5f2bc7 with SHA-1 43f9c336 is already in history

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



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