Merge "Fix mismatching surfaces position when entering split with two intents"...

Merge "Fix mismatching surfaces position when entering split with two intents" into udc-qpr-dev am: 4f0a4c94 am: 3abbc9ab

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



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