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

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

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