Merge changes from topic "presubmit-am-37de191e8f264fc2890d1cc94278eaff" into sc-qpr1-dev

* changes:
  [automerge] [RESTRICT AUTOMERGE] Correct the behavior of ACTION_PACKAGE_DATA_CLEARED 2p: 1748c4e356
  [RESTRICT AUTOMERGE] Correct the behavior of ACTION_PACKAGE_DATA_CLEARED