Merge "Revert "Add device state Hal service"" into main