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

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



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