Merge "Merge "Remove overrideIconTintForNavMode for Taskbar Nav buttons" into...

Merge "Merge "Remove overrideIconTintForNavMode for Taskbar Nav buttons" into udc-dev am: 3d2a6f1e am: ea7fe691" into udc-d1-dev-plus-aosp am: 3a9dab42 am: 2cd52eb0

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



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