Merge "SurfaceUtils: ensure lock() grants a valid pointer" into main am: 0d238df741

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

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