Merge "Update to support splitted SystemSuspend AIDL interfaces"