Merge "sdm: Fix safe mode issue while changing state from Doze to Power-On"