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

Merge "Fixed animation type for animation on the navigation bar." into tm-dev am: 8a273049 am: 32d05ace

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



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