Merge "servicemanager_test on host" am: c4a353c0ad

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

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