Merge "Ensure that the layer of topActivity can reparent to rotation leash" into main am: 37308b10b7 am: 5a64c743ad

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

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