Fixing a couple nav bar crashes am: a7c9bec46c am: a6c44d252b

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

Change-Id: If62341a0b2ccd1ba1364473dab420525a5209ee4