Merge "Replace libsuspend with android.system.suspend@1.0"