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

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

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