Merge changes from topic "presubmit-am-54c71514c6e64d9595298afeee5d4938" into sc-v2-dev-plus-aosp

* changes:
  [automerge] Utilities.trim never returns null. 2p: 5f0a5eb877
  Utilities.trim never returns null.