Merge "Remove "@1.0-" from android.system.suspend service's name" into...

Merge "Remove "@1.0-" from android.system.suspend service's name" into tm-dev-plus-aosp am: 8164406b am: 03d0409a am: 2f2bbf84

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



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