[automerger skipped] Merge "Remove Change Navigation Mode option for Taskbar Divider Popup Menu" into udc-qpr-dev am: 4dc9893028 -s ours

am skip reason: Merged-In I3664df7a134cc0eb5b4ed856c7e0730ef1b75dea with SHA-1 a26500b145 is already in history

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

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