Merge "Match Navigation Icon Colors Folded/unfolded" into udc-qpr-dev am: bde7e310 am: 8fb793c1

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23731676



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