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:40b5a52b49am:54b2bc036bam:ad2ab1b038am:295f468f37[automerger skipped] [automerge] [RESTRICT AUTOMERGE] Allow activity to be reparent while allowTaskReparenting is applied 2p:7af50c4d5fam:c30420a5cf-s ours am:8e944c7e5d-s ours am:a2c1b0bb8f-s ours am:61ef79fa5e-s ours
This commit is contained in:
committed by
Android (Google) Code Review
commit
1a7716fb93