Merge "sdm: Fix Doze/Doze Suspend"