Merge changes from topic "presubmit-am-082f69b6e78b4ed2b3d64a2becd00f57" into sc-mainline-prod

* changes:
  [automerge] Fix NPE 2p: 73d533592a
  Fix NPE
This commit is contained in:
TreeHugger Robot
2022-04-06 05:22:32 +00:00
committed by Android (Google) Code Review

Diff Content Not Available