Merge "libfakeservicemanager: no hold lock in clear" into main am: c2124f89bd am: b7c5a3365f am: 97b953a7a4

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

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