Merge "Fix navigation bar icon invisible with dimming window" into sc-v2-dev am: c170b7ea

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

Change-Id: Iaba84757dbfd6ec118fe0a56d187f35eb9d30437