[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: b482a00d -s ours am: 5c122444 -s ours

am skip reason: subject contains skip directive

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



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