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