Merge "Merge "Fix touchable region calculation in NavigationBarController...

Merge "Merge "Fix touchable region calculation in NavigationBarController (2nd)" into tm-dev am: baae0bcf am: b3cd8686" into tm-d1-dev-plus-aosp am: de7715f2

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



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