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

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21847300



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