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

* changes:
  [automerge] [RESTRICT AUTOMERGE] Allow activity to be reparent while allowTaskReparenting is applied 2p: 7af50c4d5f
  [RESTRICT AUTOMERGE] Allow activity to be reparent while allowTaskReparenting is applied