[automerger skipped] Merge "[RESTRICT AUTOMERGE] Allow activity to be reparent...

[automerger skipped] Merge "[RESTRICT AUTOMERGE] Allow activity to be reparent while allowTaskReparenting is applied" into sc-v2-dev am: 172f1c30 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20513541



Change-Id: I3ecd18eb39b9bb013a18547b3b65779b19514321
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>