[automerger skipped] Merge "Remove "@1.0-" from android.system.suspend...

[automerger skipped] Merge "Remove "@1.0-" from android.system.suspend service's name" am: 7668e5a1 am: 8638cd3b -s ours am: 8e8b9bb2 -s ours

am skip reason: Merged-In If177707ae0459cd3e0521d3b8fba8417c5609c5f with SHA-1 c56b11cb is already in history

Original change: https://android-review.googlesource.com/c/platform/build/+/2099310



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