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

[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: 91f15110 -s ours am: c022e9cf -s ours am: 25db5255 -s ours

am skip reason: subject contains skip directive

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



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