Merge "Remove "@1.0-" from android.system.suspend service's name" am: 7668e5a1

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



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