Merge changes from topic "presubmit-am-388f21e202994dfcb871fff05c757ba6" into sc-v2-dev-plus-aosp

* changes:
  [automerge] [DO NOT MERGE] Fix unexpectedly NPE on CF when calling 2p: 50a858875e
  [DO NOT MERGE] Fix unexpectedly NPE on CF when calling mDevice.getProductName()