[automerger skipped] [automerge] [RESTRICT AUTOMERGE] Allow activity to be...

[automerger skipped] [automerge] [RESTRICT AUTOMERGE] Allow activity to be reparent while allowTaskReparenting is applied 2p: 7af50c4d am: eb63c835 -s ours am: f8d17119 -s ours am: 1bcaa80d -s ours

am skip reason: subject contains skip directive

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



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