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