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: 900f5e91

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



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