Merge "Fix issue with touches falling through nav bar in 3 button nav" into...

Merge "Fix issue with touches falling through nav bar in 3 button nav" into tm-qpr-dev am: 354ad8b4 am: cb022b8e

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



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