[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-dev am: 0c000c87 am: 10166d34 -s ours am: a47f079f -s ours am: 7a3e04b8 -s ours am: 22a54993 -s ours

am skip reason: subject contains skip directive

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



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