Merge "servicemanager_test on host" am: c4a353c0 am: 22a5d123 am:...

Merge "servicemanager_test on host" am: c4a353c0 am: 22a5d123 am: db591abd am: 65649f55 am: b61bf9c2

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



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