[automerger skipped] Merge "Allow activity to be reparent while allowTaskReparenting is applied" into tm-dev am: 7ef756cc75 am: 0460042adb am: 15ff5ab8e5 -s ours am: da80e4f207 -s ours
am skip reason: Merged-In I73abb9ec05af95bc14f887ae825a9ada9600f771 with SHA-1 f63ee3bb84 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19968964
Change-Id: I30744bc9d9a35f2039f9b4dafba082e80f55a1d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: