Merge "servicemanager_test on host" am: c4a353c0ad am: 22a5d123a5

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

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