[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: 31937d2f am: 2de5f0a2 -s ours am: 24192d43 -s ours

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

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



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