Merge "Do not append additional delimiters" into tm-dev am: bb75f59792 am: 0dc400695a

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

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