Merge "Fix navigation bar icon color is not optimized for a dimming dialog"...

Merge "Fix navigation bar icon color is not optimized for a dimming dialog" into sc-v2-dev am: eae31f51 am: 5f379bef

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

Change-Id: I1f48056149e903706bfb1e096f18562d4bfc1981