Merge "libfakeservicemanager: no hold lock in clear" into main am: c2124f89 am: b7c5a336

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2892105



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