[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: c30420a5 -s ours am: 8e944c7e -s ours am: a2c1b0bb -s ours

am skip reason: subject contains skip directive

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



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