Merge "SF: prerequisite refactor to remove deprecated HIDL enum" into main