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

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

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



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