[RESTRICT AUTOMERGE] Allow activity to be reparent while allowTaskReparenting is applied am: 7da08c6bd3

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

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