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

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

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

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