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

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

Change-Id: Id09ef46d8e534da0a165c3b1df3ee0b5803db1df