Merge "Add a failsafe to update surface position after activity-level transit"...

Merge "Add a failsafe to update surface position after activity-level transit" into udc-dev am: 321ed901 am: 58f2edec

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



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