Merge "move hwservicemanager fragments" into main