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

Merge "Merge "Center nav bar vertically" into tm-dev am: a8c73beb am: 5b328e90 am: cfa70148" into tm-qpr-dev-plus-aosp am: b77f86b6

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



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