Merge "Fallback to endRelOffset for activity surface offsets" into 24D1-dev am: 5488d2d1

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



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