Fixing a couple nav bar crashes am: a7c9bec46c

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

Change-Id: I65dd5d2bb51a68277b10e643bbb62270e82ab0e7