Merge "Increase lock scope to protect variables" into main am: 8b949276

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



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