Merge "Utilities.trim never returns null." into sc-v2-dev am: 0af55bbc0c am: d0f7f13f5d

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

Change-Id: Iaf342ca69a8b1caa4aa22899341db5c7dc0aafd1