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

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



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