Merge "Merge "Center nav bar vertically" into tm-dev am: a8c73beb am:...

Merge "Merge "Center nav bar vertically" into tm-dev am: a8c73beb am: 5911b9e6" into tm-d1-dev-plus-aosp am: 75e931a8

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



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