[automerger skipped] Merge "Change name of the fake service manager" am:...

[automerger skipped] Merge "Change name of the fake service manager" am: 46ecdf82 am: 10727c4c am: 970505d9 am: 8fb85193 am: 0c1a4161 -s ours

am skip reason: Merged-In I98205c49babd2e91a8f3f643de9f3eccca302c9c with SHA-1 1f204c6f is already in history

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



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