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

[automerger skipped] Merge "Merge "Allow activity to be reparent while allowTaskReparenting is applied" into tm-dev am: 7ef756cc am: 31937d2f" into tm-d1-dev-plus-aosp am: c62a3dda -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: I3df48b0b3d7ab5a8247267728686a6ba842238e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>