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

Change-Id: I1ab6257f97935d5692fc480c44a4f042f9fe7127