[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 rvc-dev am: d6670385 am: 86138c26 -s ours am: 7de60a54 -s ours am: 3b7929f2 -s ours am: ce6f1842 -s ours

am skip reason: subject contains skip directive

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



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