Merge "Split the lock synchronizing LMKD socket reads/writes" into main am: 2aa865d1bd am: 4e6e761f05

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

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