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

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



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