[automerger skipped] Remove "@1.0-" from android.system.suspend service's name am: 22fef9d658 am: 6dfe61e1d5 -s ours am: 890ce3bae1 -s ours am: 754f8a4a59 -s ours am: f5beb1fbc0 -s ours

am skip reason: Merged-In Ia58445cbf246e3d0afdd1813c5bf9e5757410421 with SHA-1 d445a1ed46 is already in history

Original change: https://android-review.googlesource.com/c/device/linaro/dragonboard/+/2099330

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