Merge "[automerger skipped] Merge "[RESTRICT AUTOMERGE] Allow activity to be...

Merge "[automerger skipped] Merge "[RESTRICT AUTOMERGE] Allow activity to be reparent while allowTaskReparenting is applied" into sc-dev am: 0c000c87 am: 10166d34 -s ours am: a47f079f -s ours am: 7a3e04b8 -s ours am: e9c4950d -s ours" into tm-d1-dev-plus-aosp am: a1cfede6

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



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