Merge "Merge "Replace libsuspend with android.system.suspend@1.0" am: ea6b8117c9 am: 59a79fcc0a" into pi-dev-plus-aosp
am: 49056604b1

Change-Id: I4486f379caea7178e91f01e6bd78c840133c8d59