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: e564f6af -s ours am: 7b67b30d -s ours am: 61ad1f29 -s ours" into udc-dev am: 69684326

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



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