Merge "Check hasNavigationBar when showing IME nav bar" into udc-qpr-dev am: 848b83a373

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

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