Merge "aconfigd: disable socket if build flag is enabled" into main