Merge "Update to use new android.system.suspend.control AIDL interface"