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

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



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