Merge "Change name of the fake service manager" am: 46ecdf82 am: 10727c4c...

Merge "Change name of the fake service manager" am: 46ecdf82 am: 10727c4c am: 970505d9 am: 8fb85193

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



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