[automerger skipped] [RESTRICT AUTOMERGE] Allow activity to be reparent while allowTaskReparenting is applied am: 337a2353ae -s ours am: 8bcd87e202 -s ours am: 1e67b31c01 -s ours

am skip reason: subject contains skip directive

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

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