[automerger skipped] Merge "Fixing a couple nav bar crashes" into sc-qpr1-dev am: d8ea434287 -s ours am: 9bf3bffd7a -s ours am: 76b7ab968c -s ours
am skip reason: Merged-In I520ca261b012d1d7f04ea8f732819e7eb1b4f77f with SHA-1 a7c9bec46c is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15744884
Change-Id: If60ec7b59929105d0b1697a918d815bbcc71a975
This commit is contained in: