Merge "libfakeservicemanager: thread safe" into main am: e9de1d8c am:...

Merge "libfakeservicemanager: thread safe" into main am: e9de1d8c am: b5e4da0e am: e7b46b44 am: 56df7f51

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



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