Merge "Replace libsuspend with android.system.suspend@1.0"
am: ea6b8117c9

Change-Id: I489c98b374f8e5939e4c05499acd1b93d30a1f3f