Merge "Remove "@1.0" from android.system.suspend service's name" am: 15028dbe86

Original change: https://android-review.googlesource.com/c/platform/system/hardware/interfaces/+/2346884

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