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

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



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