Merge "Null check when force navigation bar true and on lockscreen." into tm-dev am: 3e2a850f

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

Change-Id: Icf430c850fbd02a9dae2f6b0e05efcc1fc894768