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

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



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