Merge "Fix nav bar icon tinting not working in SUW" into udc-qpr-dev am: ec61d09ae3

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

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