Merge "Remove overrideIconTintForNavMode for Taskbar Nav buttons" into udc-dev am: 3d2a6f1e am: 9fd21321

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



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