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

Merge "Center nav bar vertically" into tm-dev am: a8c73beb am: 5911b9e6 am: 7dfc9508 am: dca1e8be

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



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