Merge changes from topic "am-4bf8d572a7a148b890f27a2db1c84b98" into tm-d1-dev-plus-aosp

* changes:
  Merge changes from topic "presubmit-am-e095dcb8dc634f1bbc080231db8e0ba1" into sc-qpr1-dev am: 40b5a52b am: 54b2bc03 am: ad2ab1b0 am: 295f468f
  [automerger skipped] [automerge] [RESTRICT AUTOMERGE] Allow activity to be reparent while allowTaskReparenting is applied 2p: 7af50c4d am: c30420a5 -s ours am: 8e944c7e -s ours am: a2c1b0bb -s ours am: 61ef79fa -s ours