Merge "Change name of the fake service manager" am: 46ecdf82ed am: 10727c4c40 am: 970505d917

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

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