Merge "Properly unlock on return in process thread" into tm-dev am: 91bd1193...

Merge "Properly unlock on return in process thread" into tm-dev am: 91bd1193 am: 38f5250e am: c6bc2db5

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



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