Merge "Merge "Update nav bar buttons to spec." into tm-qpr-dev am: be17da6e...

Merge "Merge "Update nav bar buttons to spec." into tm-qpr-dev am: be17da6e am: 4de6ccc5" into udc-dev am: 770b554a am: 5e10a28c

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



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