Merge "Tune nav bar height" into tm-dev am: 66871fa4 am: 867014b7

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



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