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

[automerger skipped] Merge "Allow activity to be reparent while allowTaskReparenting is applied" into tm-dev am: 7ef756cc am: 0460042a -s ours am: a78ee96d -s ours am: ea537c9b -s ours

am skip reason: Merged-In I73abb9ec05af95bc14f887ae825a9ada9600f771 with SHA-1 f19d69f2 is already in history

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



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