[automerger skipped] Merge "Fixing a couple nav bar crashes" into sc-qpr1-dev...

[automerger skipped] Merge "Fixing a couple nav bar crashes" into sc-qpr1-dev am: d8ea4342 am: fa83ebcc -s ours am: 90a3e15e -s ours

am skip reason: Merged-In I520ca261b012d1d7f04ea8f732819e7eb1b4f77f with SHA-1 a7c9bec4 is already in history

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

Change-Id: I82dab1d62139d4398377ceb7fcb8c3f2a4ed20ed