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: I5f76315e405c9b2ebeca3a01f8e9a9c98a851be8