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

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

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