[automerger skipped] [RESTRICT AUTOMERGE] Allow activity to be reparent while...

[automerger skipped] [RESTRICT AUTOMERGE] Allow activity to be reparent while allowTaskReparenting is applied am: 7da08c6b am: ef00451c -s ours am: 42815bea -s ours

am skip reason: subject contains skip directive

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



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