Merge "Don't force nav bar shown if configured" into tm-dev am: a784a007 am: 58923a9e

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



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