[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: 3e91dc1f -s ours am: 3a243d92 -s ours

am skip reason: subject contains skip directive

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



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