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 am: 1441afcd

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



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