[automerger skipped] Merge "[RESTRICT AUTOMERGE] Allow activity to be reparent while allowTaskReparenting is applied" into rvc-dev am: d667038512 am: 86138c26fd -s ours am: 7de60a5467 -s ours am: b482a00d3c -s ours

am skip reason: subject contains skip directive

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

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