Merge "Fix surface got offsetted twice while entering split" into sc-v2-dev...

Merge "Fix surface got offsetted twice while entering split" into sc-v2-dev am: 8366d034 am: 13764ef3

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

Change-Id: Ic81d7579e3d9e47de52cdb02b49b9e905df0366b