Merge "Enforce onActivityReparentedToTask" into tm-qpr-dev am: f31b5dc063

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

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