Merge "Fix entry bounds for 3 button nav" into tm-qpr-dev am: a311cc37 am:...

Merge "Fix entry bounds for 3 button nav" into tm-qpr-dev am: a311cc37 am: d9857d60 am: 198a157f am: 408a4e46

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



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