Merge "Fix navigation bar icon invisible with dimming window" into sc-v2-dev...

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

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

Change-Id: I452cdba47c321c7143f20b6919c11aea6f446c9e