[automerger skipped] Merge "Revert "Fix nav bar icon tinting not working in...

[automerger skipped] Merge "Revert "Fix nav bar icon tinting not working in SUW"" into udc-qpr-dev am: 9b64508a -s ours am: 6a11881f -s ours

am skip reason: Merged-In I3f5cf85162ec28f24ea20916c8f246ff0581ddbb with SHA-1 30bd0d07 is already in history

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



Change-Id: Ia5a8303de95b846812f11109cd12fd201b9b1588
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>