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

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



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