Merge "Fix touchable region calculation in NavigationBarController" into tm-dev am: 67bb5cec

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



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