Merge "hwservicemanager and the allocator are moved to system_ext" into main