[automerger skipped] [RESTRICT AUTOMERGE] Allow activity to be reparent while allowTaskReparenting is applied am: 337a2353ae -s ours am: 8bcd87e202 -s ours am: dec8f84817 -s ours am: 59d1c8f546 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20513541 Change-Id: Ic8da7297d3ce849bc981764a35fe9a1f6ddd22f3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: