[automerger skipped] [RESTRICT AUTOMERGE] Allow activity to be reparent while allowTaskReparenting is applied am: 337a2353 -s ours am: 8bcd87e2 -s ours am: dec8f848 -s ours am: 59d1c8f5 -s ours am: c13b78ed -s ours

am skip reason: subject contains skip directive

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



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