Merge "Don't force nav bar shown if configured" into tm-dev am: a784a007 am: 2be4ec3c am: 0502399d

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



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