Merge "Refactor force visible nav bar into new secure setting." into tm-dev am: 60b397e8 am: b71f15b1

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

Change-Id: I3a572efd0458267596c4920947c459f6654f1b31