Merge "Merge "Fixed animation type for animation on the navigation bar." into...

Merge "Merge "Fixed animation type for animation on the navigation bar." into tm-dev am: 8a273049 am: 900f5e91" into tm-d1-dev-plus-aosp am: 8f4e8806

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



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