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

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



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