Merge "Remove goto used in SurfaceUtils" am: 128a91794d am: 1ec163d1c4

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2419357

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